<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <div>这是一个寂寞的天，下着有些伤心的雨 1.0</div>
<<<<<<< HEAD
    <!-- oneDev -->
    <div>这是一个寂寞的天，下着有些伤心的雨 1.1</div>
=======
    <!-- two -->
    <div>这是一个寂寞的天，下着有些伤心的雨 1.2</div>
>>>>>>> twoDev
</body>

</html>